Introduction to version control with Git

Day 3: More Git

Selina Baldauf

November 13, 2024

Today

  • Collect open questions in Excalidraw (5 min)
  • Discuss open questions and additional topics (40 min)
  • Feedback and Goodbye (10 min)

Additional topics

Ignoring files

see here

Merge conflicts

Cartoon of the GitHub octocat mascot hugging a very sad looking little furry monster while the monster points accusingly at an open laptop with "MERGE CONFLICT" in red across the entire screen. The laptop has angry eyes and claws and a wicked smile. In text across the top reads "gitHUG" with a small heart.

Artwork by @allison_horst

git fetch vs. git pull

Illustration highlighting the difference between git fetch and git pull. On the left (representing git fetch), a crocodile holding a box says to another crocodile eating salad: "They had a new topping mix at the store. Check it out, it might be good in your salad." On the right (representing git pull), a crocodile says "They had a new topping mix at the store. I bought some and mixed it into your salad" while a concerned looking crocodile looks at their salad, which now contains the topping mix of insects. Text at the bottom reads "Check what you're getting before merging it in with git fetch."

Artwork by @allison_horst

Feedback

Please take 7 min to fill out the feedback form:

https://votingo.cedis.fu-berlin.de/survey/ARZC2L

  • Use the free text question in the end for suggestions

Questions?

How to continue from here

Thanks for your participation

See you in the next workshop 👋